un-necessary code removed