Cleanign unused function branches added for debugging.
Merge branch 'test' into dev