A few more things cleaned up.