[3.1.2] Remove old code and cleanup a bit
[template] Prepare for allowing empty values

- Empty values will be used in 3.2.1
[3.2.1] Add 3.2.1
[3.3.1] Add 3.3.1