fix #1004 and #981 also remove unused code #1005

Closed belforte closed 10 years ago