This is now never used, maybe just remove it again?