Library cleanups/simplifications