Fix: Really remove all references of things hanging around