Restore test.
Remove unused (?) lat and long model attributes.