Patch from tito removing obsolete code.