Removed SecuritySupport and test