Clean up un-used code
Merge pull request #94 from midokura/ross-icehouse

Clean up un-used code