clean up no-longer-used code from JSR module
63 files changed