Added back seed reuse an cleanup