fix remove finder and update composer to use streamwrapper