Removed Junk

Removed unused and commented code.