Remove schema name from queries
Remove schema name from queries