Remove Scalaz stuff :'(
Fix bug on onward