Removed unused methods and files