This fork is for fixing remote removal