removed souts and other test code
Merge remote-tracking branch 'origin/dev' into dev