cleanup, link fix