Remove useless code

Issue #40