Clean up some leftover debug code and TODOs