Removed useless files and fixed bugs