cleanup additional classes/modules no longer necessary