Remove schema name from queries