Removed pickling dead code
Make sure to store related names by field name