Split compilation. Cleanup.