Remove all code for handling non-standard indicators