Remove old code
Fix #110