Merge "Remove unused methods and callbacks"