Cleaning up TODO