General Import Cleanup.
Granite/Entity cleanup.
Removed unused methods and added new methods.
Removed unused mappings for entity and added some field mappings.