Cleaning up and hopefully allowing this to build on RTD