Pluging mapping cleanup