async routing tidy up