Remove duplicate content.

I did housekeeping in my fork... You might want to merge that. nothing much