some changes tested
removing dead files