Removed unneeded module stuff