Cleaning up initial round of features.