remove useless code
change user drop behavior