Liquid cleanup and rebuild