shotern the time waiting for module removal
check the name of module with moduleList instead of hard-coded name prefix
Merge pull request #6 from jimjing/improveModuleRemoval

Improve module removal