Bump to last, remove some, fix some