Clean up and fixes

Delete unused classes and fix the authority and code names that are no case insensitive.