I think we should remove this stuff for the sake of simplicity.