fixed some drag problems with remove state