Remove more extraneous stuff