removed unused methods, misc cleanup