cleaned up the vapi