Aw event delivery tidy up