Get rid of some code