Some more cleanups to ol-prune