Some cleanup again!