replaced stupid selector cleaning with a serious solution