Removed the Query Builders