Updated some selectors and removed some old ones