Reduced queries on the companies api endpoint

For some reason, also had to delete spec files with no matching class.
Not sure how this got past code review.