Cleaning up bad code from previous merge
Cleaning up bad code from previous merge

enStratus/unix-agent,JPWKU/unix-agent,buzztroll/unix-agent,buzztroll/unix-agent,buzztroll/unix-agent,JPWKU/unix-agent,enStratus/unix-agent,enStratus/unix-agent,JPWKU/unix-agent,JPWKU/unix-agent,buzztroll/unix-agent,enStratus/unix-agent