Remove un-necessary