master: 1893d579f7d1c296b9bc01b81480ee268b3dcfff Major cleanup of repo