Revert "Revert "incorporate local stashed changes""

This reverts commit 3365c0045280be9cd43bb009489ca8ac3a4117a7.
formatting
remove rmvrc