Removing deprecated internal methods (deprecated in 2.1)