Clean up bad overriding methods

Removed equals and toString override