Do we really want this or is it just left-over debugging?