Pepa cleanups

Low-hanging fruit