Patching up this project a bit, removing the old and wrong Template implementation too.