Cleanup of Model and Finder