Updated template and removed files