WIP debug cleanup.