Clean up SoftwareAgent concern (fixup)

Move methods, remove InstanceMethods module.