Revert "final changes to close task #143"

This reverts commit 3fc89fab8a71005a5bb93797a51b89886f87a3fa.