Revert to using savedata class
Return status to normal after submarine dematerialisation