Disable parts of the old API