Cleaning up Object Model and its datastream