Merge "Removing some unsed compat APIs"