Oops - get the precedence right when filtering behaviours
Remove debug/logging