Comment out server gen stuff because they are not working with v2.0 yet