What is added must be removed Resolve #496