Removed uneccesary if branch