I think so. Maybe in separate ticket though? Remove files and change templates.