Remove unused methods and conf options