removed an unused method and simplified some references