Cleaning up @TODO notes