[frame] Cleanup and rebuild