Revert "Added new on-shell cards, small tweak to datacard maker when not running anomalous couplings"

This reverts commit 85d0ead5c94e06cda420c05d24d27104789db39a.
Changes to qqZZ part 1

Style updates + some naming changes