Add TypeTag and remove unnecessary dependencies.