updated modules, removed unused