remove a recent change that might have broken bluetooth

Change-Id: I654190c54a7c5e8abfc86b13fc3525777b153717
remove unused flags

Change-Id: I75f788074e75efc97df607b788aab4c2e7f026aa