Moved pruning of waveforms within BP class
Removed obsolete function