clean-up related to #163