Issue #20: removed several files