removed golden merge relicts

Change-Id: I927024d6200279cc32f216fc6c5c25d1beff135f