Maybe these two could go away, no?