Revert "enhancements"

This reverts commit 761df92589b77407e5764c3d7e7fbd897fc83df1.