Add remove function, fine tune.