Replace deprecated stuff