Nitty-gritty cleanup.