Add remove functionality, test remove and ignore functionality