Revert "include, filter, user"

This reverts commit 383612ac4cb05641fce1a9b1051afd238365f69e.