clean up modelService and remove old function calls