Removes unused import
Removes templating in favor of json updates
Removes unused import