I think this line can be remove totally now.