cleared unwanted code & done few modifications