app contains no unused code anymore. Removed all commented out code