Fixed issues with remove behavior.