[PATCH 1/2] Remove un-necessary variable checking