dll3 cleanups