More garbage cleanup.