Removed unused instruments.
Renamed addCompletion to addListener