One handle warnings. Fix #92

 * Fix #92 to remove unhandled remove warnings