Remove non standard indicator handling code