Remove potential security issue until Sec+