code cleanup and making sure complex types are not registered twice
progress towards parsing new schemas