Deleting unnecessary files
Minor templating changes