Remove now obsolete code.