Core: Fix warning
DB/Misc: Cleaning db of unused/obsolete stuff