fix bug in removing remote attributes if push is not enabled