Agreed, removing the model completely