Code Cleanup

Deleted unnecessary code