#872 Drop redirect file
#873 Update templates