read: more clean-up