fixed bug, removed junk files