Merge "Clean up legacy security code"