clean up and injection fix

Signed-off-by: Vince Kronlein <vkronlein@icloud.com>