Removed platform logic from template (bad practice)
Fix for FC034