Added Find method to Model
Code cleanup
Removed unused code