Cleanup TODOs and commands