small cleanup from recent pull request merges
merge adferguson-adf_cleanup