Remove object instantiation check