adjusted source.remove() messages