Those were accidentally re-introduced 12 years ago, let's remove them
for real this time.

Change-Id: I47e434b9f46a5966c4bcf8856d40418024ce5862
Signed-off-by: Michael Keppler <Michael.Keppler@gmx.de>