Eliminated some extraneous stuff