clean up ancient design inherited from IMP