CONN-491 Cleaned up some more directories