Really remove sigar. Minor refactoring due to rephract changes.