Massive plot cleanup