Removing un needed template