Further cleanup of select/remove methods