Cleanup before alpha release