Cleaned up unnecessary code

Took out the portions of code not being used