Some clean up before supporting alternate hex sizes