clean up, #1128, #1129
Signed-off-by:KProvance <kevin.provance@gmail.com>