autonav template cleanup