Removed some excess linkage