removed queries involving database