Removing unecessary vars