Whitespace cleanup
FC034: Unused template variables
FC024: Consider adding platform equivalents