Cleanup

Deleted TODO comments