ENH: Removed un-needed temp vars