Removed unneed condition