Clean up a few places