some clean up of unused old/testing code