removing autogenerating code, closes #40