cleaned up TODOs and commented out code