Somewhat better clean-up (minor change)

Good practice mandates cleaning up after yourself. Closing opened files
removing yet some obsolete code reminiscence since the trials.
Unfortunately already pushed and can't amend. Good to commit in baby-steps,
but not really needed on server.

Category: maintenance