Cleanup.  Removed unused code
Added new test case for dag