21.2 Clean JpsiUpsilonTools Package

This MR removes some unused files from the JpsiUpsilonTools package. Some will be added again later in a new working state.

Basic optimizations are made to some tools, these should not change any behaviour.

cc @wwalko