remove some leftover debugging code

Change-Id: I1158eb47492db9b362e693086f231ae1bb0f1d80
Merge topic 'remove_dubugging_code' into master

dda7a189 remove some leftover debugging code