Fix include/exclude of accounts; cleanup