fixed bug, and removed some files