- Removed uneeded condition