Scrubbed DStar from main branch