fix failing tests by using simple remove fn