Yes, you are correct. I forgot to add this to the list of things left to do. I have a ```TODO:``` marked there to pass in the ```UserAccount``` object, so that we clean up only the correct DB. I also need to add ```File``` utils to create the sub-folder paths, before trying to create a DB with the path, if it doesn't already exist. Coming up in the next commit on this pull request. Just wanted to get early feedback on the overall strategy of partitioning and switching.