More library code cleanup