clean up, removed selection strategy from environment (it is not used anymore)

removed unused imports