Moved unset's to more targeted location