changelog and cleanup