Library cleanup again