cleanup + #41 ongoing