Removed TODOs about autogenerated catches, they are okay! - demo-commit2