Remove excluded_subdir/subdir options

With artifact as a proto, it doesn't make sense to do it this way, bits
of code can be removed.

Part of #974
3 files changed