Removed some files and fixed bugs