cleanup, splitting the work on deepdirs into a different branch