Remove tweak for null objects