cleaning up connected_to_intrinsic stuff