Remove un-necessary variables and add DCHecks