rm mapping elements, causing errors in config
Fix more issues