Cleanup of numerous bits and pieces.