Further removal of redundant wav rewriting