Removed unnecessary crap in preparation for the migration to voxiolib