Further removed some unecessary code used specifically for API generation. More stripping to come, around sample files and templates.