Remove draft code, closes #138