cleaned up www specific stuff