better picking support some cleanup

Change-Id: I199eb7fb5128884763067568a6a5aec398fb414f