More stuff related to deleting empty classes

Not sure why this didn't get committed with the "Deleted empty classes"
push.