Additional HS2 cleanup post beeswax integration