Grae Autumn 2017 Cleanup - Onedriven