Adding spring clean up to generator clean