Cleanup + close #35 #41 #