Removed not needed conditions