Remove useless code (no need for that anymore)
Fix #26