Added dirty hack
Removed deprecated variable