Removed additional unused methods