This can be removed now, right?