Get rid of all this…

get rid of all this