Merge "Remove APIs that are not directly usable"