Clean up changelog and commit to unstable