Reverted unwanted and non-relevant changes (#176)