Cleaned up debugging invocations