Removed what I thought to be unnecessary.  Some things I was unsure about so I just left them in.