I don't think these are needed anymore
Remove deprecated -, + maps
Update plugins