Some cleanup (two-level-super-amazing-architecture uncovered).