Remove debug statements
Support case where instance name is not tagged