removing a couple of extraneous modules
another cleanup