Revert "final minor changes"

This reverts commit ce70fa4261aa6978b3430d089ba702e025badfde.
test