clean up interface to custom modules