Removed unused DebugTargetExtension class; Minor cleanup