fixed names ,remove unused code