removed several unneeded modules