Remove duplicate code and add todo

Found while looking at bug 47974

Change-Id: I7d4ef165e36e96cb6a61880a3413d8883c51c7fd
Merge "Remove duplicate code and add todo"