Serious configuration cleanup