I think this line can be removed now?