- Fix several bugs in select code and remove some dead code