Removed unncessary vars at top