Cleanup + handle errors in loading subdirs