removed unused methods and file