Update changelog
Cleanup.
Spec cleanup