Added "remove" functionality