clean up, updated modules registration