Remove Secrets and Constant