Remove untested and unused code
Merge pull request #1660 from lavalamp/fix2

Remove untested and unused code