refactor:  remove rawMux