Remove code from SelectionModules

Almost all deprecated warnings will disapear because the code only exists once.