Clean up of original template
Minor updates to support PUT operation and cleanup