removed numerous cruft methods & fixed up some