Removed debug statements and reverted CRC changes