Cleanup

A bit of cleanup after the latest changes.