Removing more unecessary modules