Cleaning up after Kristaps