Remove old code and close #21