Working on ISSUE #121: Shout out follows
Removed broken testing-code