Merge "Delete Unsupported APIs" into main