cleanup within the Model package