Clean up, remove manual use of jackson objectmapper, returning objects.