More variable cleanup