Removed unused ObjectMapper which is potentially confusing