Cleanup after PR merge, updated changelog