removed unused methods and attributes