removed all references to selection