Get rid of some of the additional steps for now