Tidy up before the big decision. I will most likely drop the Scalaz stuff and leave it for the next activator.