Remove deprecated API that is not being used by plugins