some cleanup, getting ready to do a nice full implementation of the soon to be newly defined bossy protocol