Revert "partial cleanup up for the selling"

This reverts commit aab610488c2063cca94b423a957440bed6850473.