Build fix

Also use key instead of key::filename to remove data