minor cleanup.  really need to detemrine usage...