Once again take out async setting up of links since it causes crashes - not sure where last commit fixing this went.