Remove unused code that has issues
Merge pull request #61 from Medium/xiao-remove-problematic-and-unused-code

Remove unused code that has issues