Removed additiona unused modules.