removed some extraneous thigs