[CB-4116] remove dupe code
updated to remove conflicts with vibration