Qual: clean code from deprecated vars