Remove checks from object class