i need to clean up in Models