Object mapping

- Removed unused object mappings.