Removed some TODO statements that were either blank or mysterious.