clean feature_testing branch