remove already defined mappers
fix after sa upgrade
fix imports
add ignore