Merge "Removing remnants  of menu key"