Removed unnecessary conditions