(#44): remove and add work for managing object class Target.