Clean up
Ensure code runs for model without bound generators
Prepare for release