Cleans up stale comments
Adds TODO