Update v1.18; Bug fix 70002; Removed unused code;