More variable cleanup.