clean up marshal generation