more work in progress - getting rid of alpheios-ish references