removed rubbish
fixed all files