Removed Unnecessary code

Removed variables that are no longer used