These two lines should go.