pic cleanups