Remove references to typesafe and annotations in distrubution bundle