remove useless conditional.
Merge branch 'bugfixes'

Conflicts:
	src/hci.cpp