Removing unused methods and warning