This can be removed now as well.