removing duff code