Removing debug messages and reverting a debug conditional