cleanup, fixed pre-selection