Merge "Remove old APIs that are no longer used/implemented"