Additional HS2 cleanup post beeswax integration
Merge pull request #16 from laserson/beeswax

Additional HS2 cleanup post beeswax integration