Removes duplicate defines, updates comments

Fixes #5529