More cleanup, return link