Took out extraneous stuff that was required