removed un-necessary code