Feature Selection cleanup