Commented elements removed. Old stuff no longer needed.