More hosts
Remove old stuff, add aws