Removing debugging calls