Removed old code (close #17)