Cleaned up code.  Removed obsolete coding
Removed duplicate model file