cleanup & add changelog