Add implementation for source-remove