to clean up now, added an issue #193 for that and assigned it to me.