added util/remove-the, minor cleanup