Performing some cleanup on the schema generation.