3.0 - Remove methods for BC and deprecation