Fixed last outstanding bug in equal
Now that we have equals use it.
More code clean up