Removing logging code