Get rid of register stuff