Commented out queries for now