WIP.Code cleanup.