Clean up model handling
Clean up