removed unnecessary classes
new build