Cleanup and remove Voice+

Change-Id: If3f520038fd597bab84d0573a60a52a6e2b68efd