Cleaning out library, part 2