API key templating, remove redundant submit