clean up sensor select code