better subscription link, cleanup