Fixed link table issues around removing and storing