amami: update deconfig with v21 changes & delete old files