add offline removing support