Revert unwanted code added after 0.15.2 tag & Make fixes accordingly

[sophie-cluml]

closes #98

[codecov-commenter]

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2b16047) 35.50% compared to head (832f562) 35.66%.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files

@@            Coverage Diff             @@
##              tis      #99      +/-   ##
==========================================
+ Coverage   35.50%   35.66%   +0.15%     
==========================================
  Files          13       13              
  Lines         676      673       -3     
==========================================
  Hits          240      240              
+ Misses        436      433       -3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.