Removing unnecessary check