Voicemail limitations for UCP and some cleanup