- simplify PSregistry as already proposed in comments