more metadata changes and remove login