Cleanup

Removed commented out code
Moved Sounds to Engine