remove empty classes
Merge remote-tracking branch 'upstream/master' into GORA_199