Removed old code, fixes #90 (I hope)