Remove code from SelectionModules