+++ Fixed duplicate model bug
+++ Deleted unused files