Cleaning up for final SusyTools 03-04