Removed superfluous modules