- pl, cleanups