Added #remove + tests.