few exception changes are done & one file deleted