Cleanup develop all the things 

Progress on this detailed here: https://docs.google.com/a/learningequality.org/document/d/11lEO606CtQZayu9W3s4qtE-qvNIW4iK_MuoBzJ8o-gM/edit#bookmark=id.vy853qxvmskx

PR opened just to compare changes and to do a double review, because I'm working kinda fast and cross eyed.