marvel: cleanup init