remove some more dead code, and make some methods as private since they are no longer used from outside this class