cleaned up TODOs