Removed old code

Deleted deprecated variable assignments