Cleanup, removed a model that did not belong in here