Removed a couple of conditions no longer needed