Second major cleanup of lib/