Remove Ord instance
Improve work around
Simplify