Cleaned up unnecessarily specific selectors