more cleanup of unused directories