Remove some logic that wasn't helpful