Code cleanup

Removes unused and commented out code
Code cleanup

Removes unused and commented out code