Remove unused usings
Make these usings more clear
Move this function up beside the alternate platform implementation
Using tidy up
Small whitespace fixes
Dead code removal
unrequired bits.
using this in rather than complicating the code a bit
Try fix PSM build issues, I'd done these ones by hand.
Fix Web too.
Fix Web more
Fix Web more more
Merge pull request #2417 from danzel/usingtidy

Tidying up using statements
Merge back from develop