Remove serialization from shutdown method