Removing comment out code and not needed todos