more clean-up related with removed checksum operation