Change remove to a more genric object state enum