security handling
security comment removal