[WIP] DB cleanup