Revert "More new codes for security manager"

This reverts commit 322cd1d8cfa943a5b4ac286ca0d34fa783e6da51.
Revert Changes