added removal logic