Got rid of dependency on deriving data
Removed any changes to original Elm code