Cleanup: added some comments, removed some modules