fixing issue and cleaning up
Merge branch 'yolo-no-source-fix'