Some cleanup2