Removed unused code see #88