Deleted not used files & fixes