(mess) pc: further separation and cleanup (nw)