fix #298. Removing orphan code
Merge pull request #389 from karlcow/298-orphan

fix #298. Removing orphan code