post-refactor cleanup, updated changelog