[geis] Cleanup and rebuild