Secure Controller cleanup