Merge left over

which is not functional on 4.3 any more
and redundant

Change-Id: I281009d83cb96216018e88075684549c3e71625d