Variable cleanup fix.