Align versions
Clean up for #1