cleanups. Build 3.