Removed more unsupported old code