EOF clean-up