ridding debug code
Merge branch 'matt_dev' into dev