First minor cleanup sweep