some variable cleanup