Remove leftover
Implement migration tool from the old database structure to the new one