Cleanup v.1 working.

Quotes, tables residua and other mess still remains.