Found a few more things to clean up.