Tidy up affordances and link relations