Cleaned code, removed options not needed for our usage.

Integrated Commons where possible

First Release