Fixed unnecessary plotting/recording of traces