Implement lookup and removal