some cleanup and no rolling links