took out some extraneous shit