Removing unneeded classes
Fixing participant default/preferred/effective site