Updated CHANGELOG according last changes
Cleanup