Fix 'false' test to used string compare and remove code from other branch