removed useless files and changed code