removing stuff from FeatureExtraction branch