Got rid of two voidlinks