removed some extraneous stuff