Remove methods for BC and deprecation