Refactor unused code
Update database structure
Remove unused resource