marvel: cleanup and fix build