Deprecated and unmaintained vapi removal