some dav cleanup