Remove some modules we no longer use