Undeprecate used vars in Database package [ci skip]