General variable cleanup