added remove (buggy)