removing unused classes
adding trimming option
Merge branch 'master' into 4genomesmodelsystem