Revert "Fixed and close #95"

This reverts commit c698d6ebe036e03599637d2f1b773c974cadd30c.
Cleanup after bad commit