Added remove feature