Make manifest/keystore/import/* definitions obsolete