remove empty or

This is an additional commit to 66397a4fd222757a8bd651c0c297615319eac4a5

Change-Id: I61df7984090e984f50788d0c2573d3bf8bac233b