Cleanup

Removed Some unnecessary code.