Removed unnecessary modules