Removed server/waves and added spawners