Oops, remove old remnants of new code forgotten about.