Some general cleaning up.