removed extraneous stuff