removing the un-necessary code