Removing if check