Move on_other_part into serialisable state
Remove some temporary code and fix a warning