Fix deprecation warnings

Vec shift was replaced with remove