saving a few cleanup queries