integration of AbstractFreeMarkerAwareResponseMapper and the reduction and removal of lots of redundant code