More general cleanup.