Removed unecessary modules