Merge "remove security menu"