Removed unnessesary modules