Removed some comments relating to my tables
Now using metadata

I am now using the metadata holder.
I added the ability to have distinct clauses