Remove 3.0 deprecated API