Started to remove the hashcode/equals/tostrings