Clean up - Part 1

As this is my first pull request for clean up, can you confirm whether you like these changes?

If you don't like them then just let me know and don't pull :) I won't be offended.

Also, would you like me to remove all the auto-generated stubs?