Clean up a few miscellaneous items