cleanup, BAMvc4 ready for initial templatization