Removing nao_control stuff.