#WP-5: rest of DB-related things removed