Some additional cleanup.