many changes
removed dead files