cleanup use of namespace partitioner
use spock for csp