Still cleaning house a bit