Got rid of unsupported variables