Remove unused code (fix #33)