Get rid of all this, simplify.