Removed TODOs which have already been completed