more clean up of unused methods, refactoring to rename methods, changing more method visibility