clean up *THX usage