Added removal of objects