Remove useless code, fixes #52