Always remove disguise and update if necessary