FW-257. Cleanup.