LPS-37289 Removes duplicated delegates on same container
LPS-37289 Moves to a plugin
LPS-37289 - Source formatting
LPS-37289 - Source formatting