remove obsolete DUMMY constant
Merge remote-tracking branch 'grondilu/master'