Removed unused methods and import statements