Removed unnecessary 'schema' hack