Merge "API cleanup - delete @removed methods"