Remove test/debugging logging
Remove unused ObjectMapper
Use map instead of pattern matching