Cleanup of unnecessary changes
Remove auto-generated TODOs