remove old 1a code
remove some more old code
another pass of renaming things for the main lib