cleaned up out of date selectors