more variable cleanup