Added functionality for removal