[grail] Cleanup and rebuild