Revert "enhancing cms"

This reverts commit 31b456d510f3f25884df83b025267dba93a8d8e7.