Remove unused methods and prefix