Removed SelectionAPI (temp) fixes, NPEs, and cleanup
Signed-off-by:Craig Russell <tenowg@gmail.com>