Update simplified calls + updated the remove of elents inside of maps -> it...

Update simplified calls + updated the remove of elents inside of maps -> it actually removes them and not just puts ''' inside the maps (so it's cleaner now)