- removed TEMPLATE leftovers
- rel 2