dealt with netbeans warnings
removed unnecessary model classes