Removed all references to linked aspects