clean up some module type declarations