add deletion functionality; better separation of ModelDataSourceView CBV;