Adding OpenNICaptureClass and cleaning up
cleaning up