Code Review pull request

You should remove empty helpers created by generators. You can always recreate them if you need them.