Fix: Better fix for cleaning vars