Removed some queries