Clean up and comment dropbox completion