mapping issues fixes and deprecated functions removing