Merge "Removing @removed methods and constants"