Cleanup
beta0 can now either be included into beta, or be seperate