Added first version of remove support.