I think this can be safely removed now, right?