Big cleanup and smaller repo