Optimize the remove function

Signed-off-by: jssoscar
Date: 2014-1-15 12:20:05
Version: 2.0