Bug fixed, deleted unsed files