Remove unused imports
Move Equals & hashCode checking to the correct facade