removed duff stuff