Remove extraneous stuff