Cleanup PR #268