remove --cwd-max-dir-size related code, another feature, another merge)