Some janitoring and cleaning up.