Remove schema dependency