Remove un-necessary code