Classes moved back to the spec since they were not used anywhere else