Clean up comment
Clean up empty directory branches in the target dir