Remove some extraneous stuff