comenting out random html that doesn't seem to be needed
merging work