remove db & desktop to the data
code refactiring