cleaned up some more unrelated modules