Added logic to remove helper