added Module Overriding
Moved CommandRemoval