clean-ups in block parsing