Some minor changes to remove the trash