- cleanup and changelog update