removing the old content selector infrastructure