cleanup modules, TODO validation