Remove the deprecated API