Some cleanup 2