Revert "clean up from merge v2"

This reverts commit 32e619db2888d96bf28df247c2ab081c7f51089c.
clean up from merge v2.1