Some general cleanup.