Various cleanup

Mostly just deleting stuff I've missed in the past.