Revert "Update Feature and Dynamic Management"

This reverts commit 4c65312352a22e70e8db1a7158af1959b56047e9.