remove unused properties
cleanup
cleanup S2 tests
Merge remote-tracking branch 'origin/master'