JPM: cleanup from some time ago