Cleans up the TODO