Do we still need this?  If not lets get rid of it.