More cleanup in the default theme.
The default theme cleanup continues.