More code cleanup in library page.