Moving the distinction between Mac and iOS out of the model and into the templating.  Removing dead code.