CoreObject clean-up