Remove dead code
Entity unmarshaller
Json unmarshalling using jackson