Revert "Merge pull request #86 from Anu6is/cleanup"

This reverts commit c4c362be15a9ed57f76027b09b3df0b2011bb8f7.