Remove no longer needed compatability code