Removing unused debug info.
Merge branch 'test' into dev